Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tell the compiler to emit the correct reference to system.runtime.numerics for non mscorlib builds #1688

Merged
merged 1 commit into from
Oct 31, 2016

Conversation

KevinRansom
Copy link
Member

@KevinRansom KevinRansom commented Oct 31, 2016

TypeForwards on netcore builds were referencing system.numerics.

This PR fixes that by having non mscorlib builds reference system.runtime.numerics

@@ -4570,7 +4570,7 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
// OK, now we have both mscorlib.dll and FSharp.Core.dll we can create TcGlobals
let tcGlobals = mkTcGlobals(tcConfig.compilingFslib,sysCcu.FSharpViewOfMetadata,ilGlobals,fslibCcu,
tcConfig.implicitIncludeDir,tcConfig.mlCompatibility,using40environment,
tcConfig.isInteractive,getTypeCcu, tcConfig.emitDebugInfoInQuotations)
tcConfig.isInteractive,getTypeCcu, tcConfig.emitDebugInfoInQuotations, (tcConfig.primaryAssembly.Name = "mscorlib") )

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: In a var?

@KevinRansom KevinRansom merged commit 6742723 into dotnet:master Oct 31, 2016
@KevinRansom KevinRansom deleted the numerics branch October 31, 2016 20:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants